Auto merge of #1935 - steveklabnik:gh1898, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Aug 2015 22:07:53 +0000 (22:07 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Aug 2015 22:07:53 +0000 (22:07 +0000)
commit6404de08fdd3f1d08e5c2d3a793920dc07de9439
treebbd0cb8e79648a4150f9416e5e213d88e73f5bf6
parent33528c847af596ad5606acf97977baa54bc85f62
parent91b52201b5088eeb0fe96230e070741e4834ea18
Auto merge of #1935 - steveklabnik:gh1898, r=alexcrichton

Fixes #1898